chore(x-goog-spanner-request-id): plumb for BatchCreateSessions #3815
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
product-auto-label
bot
added
size: l
odeke-em
force-pushed
the
x-goog-spanner-request-id-plumb-into-BatchCreateSessions
branch
2 times, most recently
from
b9e9734 to
f4c6768
Compare
odeke-em
force-pushed
the
x-goog-spanner-request-id-plumb-into-BatchCreateSessions
branch
from
f4c6768 to
ecb64c7
Compare
|
@sakthivelmanii @olavloite @rahul2393 @surbhigarg92 kindly help me run the bots here. Thank you. |
odeke-em
force-pushed
the
x-goog-spanner-request-id-plumb-into-BatchCreateSessions
branch
2 times, most recently
from
4bdb739 to
e7463fb
Compare
rahul2393
added
the
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
olavloite
reviewed
May 14, 2025
google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java
Outdated
Show resolved
Hide resolved
google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java
Outdated
Show resolved
Hide resolved
google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java
Outdated
Show resolved
Hide resolved
google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
Outdated
Show resolved
Hide resolved
google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionClient.java
Outdated
Show resolved
Hide resolved
google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
Outdated
Show resolved
Hide resolved
| @@ -435,14 +466,18 @@ public AsyncTransactionManagerImpl transactionManagerAsync(TransactionOption... | |||
|
|
|||
| @Override | |||
| public ApiFuture<Empty> asyncClose() { | |||
| return spanner.getRpc().asyncDeleteSession(getName(), getOptions()); | |||
| XGoogSpannerRequestId reqId = | |||
| this.getRequestIdCreator().nextRequestId(1 /* TODO: channelId */, 0); | |||
There was a problem hiding this comment.
Suggested change
| this.getRequestIdCreator().nextRequestId(1 /* TODO: channelId */, 0); | |
| this.getRequestIdCreator().nextRequestId(1 /* TODO: channelId */, 1); |
There was a problem hiding this comment.
I manually have been increasing attempts for it. Let's get this merged in as is and in the next round I shall get them all fixed up.
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| ISpan span = tracer.spanBuilder(SpannerImpl.DELETE_SESSION); | ||
| try (IScope s = tracer.withSpan(span)) { | ||
| spanner.getRpc().deleteSession(getName(), getOptions()); | ||
| XGoogSpannerRequestId reqId = | ||
| this.getRequestIdCreator().nextRequestId(1 /* TODO: channelId */, 0); |
There was a problem hiding this comment.
Suggested change
| this.getRequestIdCreator().nextRequestId(1 /* TODO: channelId */, 0); | |
| this.getRequestIdCreator().nextRequestId(1 /* TODO: channelId */, 1); |
There was a problem hiding this comment.
I manually have been increasing attempts for it. Let's get this merged in as is and in the next round I shall get them all fixed up.
google-cloud-spanner/src/main/java/com/google/cloud/spanner/XGoogSpannerRequestId.java
Outdated
Show resolved
Hide resolved
google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
Outdated
Show resolved
Hide resolved
odeke-em
force-pushed
the
x-goog-spanner-request-id-plumb-into-BatchCreateSessions
branch
from
cd1af14 to
8c48dec
Compare
odeke-em
force-pushed
the
x-goog-spanner-request-id-plumb-into-BatchCreateSessions
branch
2 times, most recently
from
39fdba9 to
9484419
Compare
olavloite
added
the
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
odeke-em
force-pushed
the
x-goog-spanner-request-id-plumb-into-BatchCreateSessions
branch
from
9484419 to
d08e24c
Compare
This change plumbs x-goog-spanner-request-id into BatchCreateSessions and asserts that the header is present for that method. Updates googleapis#3537
This change plumbs x-goog-spanner-request-id into BatchCreateSessions and asserts that the header is present for that method. Updates googleapis#3537
More updates DatabaseClientImpl.runWithSessionRetry update on ID Move reqId attempt increase out of runWithRetries Apply allOptions copy everywhere Complete testrunWithSessionRetry_withRequestId
odeke-em
force-pushed
the
x-goog-spanner-request-id-plumb-into-BatchCreateSessions
branch
from
9608560 to
591ab72
Compare
olavloite
added
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
olavloite
approved these changes
May 26, 2025
Comment on lines
+1090
to
+1097
| public int hashCode() { | ||
| return RequestIdOption.class.hashCode(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| return o instanceof RequestIdOption; | ||
| } |
There was a problem hiding this comment.
Regarding #3815 (comment)
LastStatementOption does not contain any state, and hence the hashCode and equals methods just returns the hash code of the class / checks if the other object is also an instance of the same class.
This option does contain state, and the hashCode and equals methods should use that state to calculate a hash value and check equality. Let's fix that in a follow-up PR.
There was a problem hiding this comment.
@olavloite I've implemented it in PR #3900
odeke-em
deleted the
x-goog-spanner-request-id-plumb-into-BatchCreateSessions
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change plumbs x-goog-spanner-request-id into BatchCreateSessions and asserts that the header is present for that method.
Updates #3537